From 3b5235416d308fc6868b2d0eca67c3a34cbb17f4 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 15 Aug 2022 15:16:05 +0100 Subject: [PATCH] Stop working around a Meson 0.63.0 bug that was fixed in 0.63.1 --- ...isable-inscription-markup.ui-reftest.patch | 4 +- .../Work-around-1014417-in-Meson.patch | 250 ------------------ debian/patches/series | 1 - 3 files changed, 2 insertions(+), 253 deletions(-) delete mode 100644 debian/patches/Work-around-1014417-in-Meson.patch diff --git a/debian/patches/Disable-inscription-markup.ui-reftest.patch b/debian/patches/Disable-inscription-markup.ui-reftest.patch index e29babd0fc..54d3b1e5e9 100644 --- a/debian/patches/Disable-inscription-markup.ui-reftest.patch +++ b/debian/patches/Disable-inscription-markup.ui-reftest.patch @@ -12,10 +12,10 @@ Forwarded: not-needed, workaround 1 file changed, 2 deletions(-) diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build -index 504ea01..68e24c6 100644 +index 2cd31db..74d8568 100644 --- a/testsuite/reftests/meson.build +++ b/testsuite/reftests/meson.build -@@ -361,8 +361,6 @@ testdata = [ +@@ -367,8 +367,6 @@ testdata = [ 'image-load-from-file.css', 'image-load-from-file.ref.ui', 'image-load-from-file.ui', diff --git a/debian/patches/Work-around-1014417-in-Meson.patch b/debian/patches/Work-around-1014417-in-Meson.patch deleted file mode 100644 index 014b2251e2..0000000000 --- a/debian/patches/Work-around-1014417-in-Meson.patch +++ /dev/null @@ -1,250 +0,0 @@ -From: Simon McVittie -Date: Mon, 8 Aug 2022 16:50:40 +0100 -Subject: Work around #1014417 in Meson - -Forwarded: not-needed, Meson should be fixed instead ---- - testsuite/a11y/meson.build | 2 +- - testsuite/css/change/meson.build | 2 +- - testsuite/css/meson.build | 6 +++--- - testsuite/css/nodes/meson.build | 2 +- - testsuite/css/parser/meson.build | 2 +- - testsuite/css/style/meson.build | 2 +- - testsuite/gdk/meson.build | 4 ++-- - testsuite/gsk/meson.build | 4 ++-- - testsuite/gtk/meson.build | 6 +++--- - testsuite/meson.build | 7 +++++++ - testsuite/reftests/gtk-reftest.c | 4 ---- - testsuite/reftests/meson.build | 2 +- - testsuite/tools/meson.build | 2 +- - 13 files changed, 24 insertions(+), 21 deletions(-) - -diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build -index 4f50d3a..a0344f5 100644 ---- a/testsuite/a11y/meson.build -+++ b/testsuite/a11y/meson.build -@@ -84,7 +84,7 @@ foreach t : tests - - test(test_name, test_exe, - args: [ '--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - timeout: test_timeout, - env: test_env, - suite: ['a11y'] + test_extra_suites, -diff --git a/testsuite/css/change/meson.build b/testsuite/css/change/meson.build -index 9409f48..c88ea61 100644 ---- a/testsuite/css/change/meson.build -+++ b/testsuite/css/change/meson.build -@@ -22,7 +22,7 @@ test_change = executable( - - test('change', test_change, - args: [ '--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: changetest_env, - suite: 'css', - ) -diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build -index 20c0314..dcc9240 100644 ---- a/testsuite/css/meson.build -+++ b/testsuite/css/meson.build -@@ -25,7 +25,7 @@ test_api = executable('api', 'api.c', - - test('api', test_api, - args: ['--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: csstest_env, - suite: 'css', - ) -@@ -40,7 +40,7 @@ test_data = executable('data', 'data.c', - - test('data', test_data, - args: ['--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: csstest_env, - suite: 'css', - ) -@@ -54,7 +54,7 @@ transition = executable('transition', 'transition.c', - - test('transition', transition, - args: [ '--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: csstest_env, - suite: 'css' - ) -diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build -index eb619cf..3c80ba2 100644 ---- a/testsuite/css/nodes/meson.build -+++ b/testsuite/css/nodes/meson.build -@@ -17,7 +17,7 @@ test_nodes = executable('test-css-nodes', 'test-css-nodes.c', '../../testutils.c - dependencies: libgtk_dep) - test('nodes', test_nodes, - args: [ '--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: nodetest_env, - suite: 'css', - ) -diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build -index d0fdd0d..3029f53 100644 ---- a/testsuite/css/parser/meson.build -+++ b/testsuite/css/parser/meson.build -@@ -529,7 +529,7 @@ foreach testname : test_data - '-k', - join_paths(meson.current_source_dir(), testname), - ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: [ - 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), - 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()) -diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build -index 3228049..a17b0c4 100644 ---- a/testsuite/css/style/meson.build -+++ b/testsuite/css/style/meson.build -@@ -28,7 +28,7 @@ test_style = executable( - ) - test('style', test_style, - args: [ '--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: styletest_env, - suite: 'css', - ) -diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build -index af93721..6fea1f6 100644 ---- a/testsuite/gdk/meson.build -+++ b/testsuite/gdk/meson.build -@@ -40,7 +40,7 @@ foreach t : tests - - test(test_name, test_exe, - args: [ '--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - is_parallel: t.get('parallel', false), - env: [ - 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), -@@ -66,7 +66,7 @@ foreach t : internal_tests - - test(t, test_exe, - args: [ '--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: [ - 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), - 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), -diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build -index c780008..db97e03 100644 ---- a/testsuite/gsk/meson.build -+++ b/testsuite/gsk/meson.build -@@ -262,7 +262,7 @@ foreach t : tests - - test(test_name, test_exe, - args: [ '--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: [ - 'GSK_RENDERER=cairo', - 'GTK_A11Y=test', -@@ -296,7 +296,7 @@ foreach t : internal_tests - - test(test_name, test_exe, - args: [ '--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: [ - 'GSK_RENDERER=cairo', - 'GTK_A11Y=test', -diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build -index 4c5d70a..e02e37a 100644 ---- a/testsuite/gtk/meson.build -+++ b/testsuite/gtk/meson.build -@@ -187,7 +187,7 @@ foreach t : tests - - test(test_name, test_exe, - args: [ '--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - timeout: test_timeout, - env: test_env, - suite: ['gtk'] + test_extra_suites, -@@ -220,7 +220,7 @@ foreach t : internal_tests - - test(test_name, test_exe, - args: [ '--tap', '-k' ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - timeout: test_timeout, - env: test_env, - suite: ['gtk'] + test_extra_suites, -@@ -238,7 +238,7 @@ if add_languages('cpp', required: false, native: false) - ) - test('c++ keywords', test_exe, - args: [ '--tap', '-k' ], -- #protocol: 'tap', -+ #protocol: tap_test_protocol, - env: test_env, - suite: 'gtk', - ) -diff --git a/testsuite/meson.build b/testsuite/meson.build -index 97344f3..05d6a57 100644 ---- a/testsuite/meson.build -+++ b/testsuite/meson.build -@@ -2,6 +2,13 @@ gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir')) - installed_test_bindir = join_paths(gtk_libexecdir, 'installed-tests', 'gtk-4.0') - installed_test_datadir = join_paths(gtk_datadir, 'installed-tests', 'gtk-4.0') - -+if meson.version() == '0.63.0' -+ # Work around https://github.com/mesonbuild/meson/issues/10577 -+ tap_test_protocol = 'exitcode' -+else -+ tap_test_protocol = 'tap' -+endif -+ - common_env = [ - 'GIO_USE_VOLUME_MONITOR=unix', - 'GSETTINGS_BACKEND=memory', -diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 8062854..9af1bf9 100644 ---- a/testsuite/reftests/gtk-reftest.c -+++ b/testsuite/reftests/gtk-reftest.c -@@ -618,9 +618,5 @@ main (int argc, char **argv) - - result = g_test_run (); - -- if (using_tap) -- return 0; -- - return result; - } -- -diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build -index e5fe2af..504ea01 100644 ---- a/testsuite/reftests/meson.build -+++ b/testsuite/reftests/meson.build -@@ -631,7 +631,7 @@ foreach testname : testdata - '-o', join_paths(meson.current_build_dir(), 'output'), - join_paths(meson.current_source_dir(), testname), - ], -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: reftest_env, - suite: 'reftest', - should_fail: xfails.contains(testname), -diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build -index 582bce6..4b12797 100644 ---- a/testsuite/tools/meson.build -+++ b/testsuite/tools/meson.build -@@ -21,7 +21,7 @@ if bash.found() - test(t, bash, - args: t, - workdir: meson.current_build_dir(), -- protocol: 'tap', -+ protocol: tap_test_protocol, - env: [ - 'TEST_RESULT_DIR=@0@'.format(join_paths(meson.current_build_dir(), 'output')), - 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), diff --git a/debian/patches/series b/debian/patches/series index 2a14fb9058..d076cd073a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ reftest_compare_surfaces-Report-how-much-the-images-diffe.patch reftests-Allow-minor-differences-to-be-tolerated.patch debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch debian/Disable-clipboard-test.patch -Work-around-1014417-in-Meson.patch Disable-inscription-markup.ui-reftest.patch -- 2.30.2